Google is going to have a fix for it but for the meantime yeah you could try doing something different