hotfix for several issues