Fix 500 error on 2.5