hotfix, added guards