Fix Issue #68

https://github.com/mailwatch/1.2.0/issues/68