err: some bug fixes to support correct dropping