Email quickfix
Bug fix