Forgot to make compatible with 1.8.x