1.7.10 compatibility