Temporary fix for Mailcatcher