Fixed non-custom modes not working