Flickering bug solved