Fixed flickering bug (sorta)