Fix an Issue - Samsung Galaxy S9