Fixed #2899 (NODROP and closets doing weird shit)

Fixed #2899