should fix a bug in mail