Allow for 1.8.7 compatibility

Allow for 1.8.7 compatibility