1.8.7 compatibility patch