Let's hope this fixes it once and for all