DROP bug fix