Fix for some devices