Better way of fixing the Samsung issues