Fix an Issue - Samsung Galaxy S8