temp fix for gmail issue