1.6.2 compatibility