Workaround postfix issue