Fix for modern style