1.5.2 compatibility