fix for 1.5.2