Drop command improved