moar 1.8.7 changes