Bug fix for Samsung S2, S3