Manually added Dan's Hotfix