Lag issue hotfix