Fix drop/drap