Hoping this will fix weird things going on.