Fix for Gmail