hotfix fixes