hotfix: remove if statement