Fixed major issues in dropping