Fixed a lag issue