Fixed the lag issue