Lucas hotfix