Fix for different settings