Hotfix overflow