Drop 1.8.7 support
Fix issue with 1.9.3