fix some drop issues