Fixed conditional comments issue for modern options