Fix for Samsung clients