Fixed flickering bug
Fixing bugs