1.5.6 compatibility