Fixed 1.8.7 compatibility a second time