hopefully this addresses flicker
scripted update of code from master at 7e3edc6 hopefully this addresses flicker