fixed flickering!