more work on 1.8.7 compatibility