Another fix for 1.8.7