old fix
Merge branch 'master' of https://github.com/alex-bu-89/fpamailer