another go for 1.8.7 support