Fix for custom modes