Fix for weirdness from google