Fixed text+shape flickering