mandrill bug fix