Fixed jumping and flickering