Mandrill bug fix