Workaround for issue with some samsung devices