Fix for mandrill tags