Fixed for 1.8.7