Add condition to handle drop correctly