Lets keep this 1.8.7 compatible