Fixing a lag issue