'flickering bug when first focus' bug is fixed