Removed bucket drop issue