1.8.7 compatibility

see #26