drop 3 fixes
v1.5.2