Pre 21 screen reset fix