JP prevent things that break in 1.0411