fixes
merge with foooon
ver
#CEXT 336, dropHandler