testing some drop fixes