redraw fix
merge fix