This is a fix for the eml forward module