Made fix for different devices