hotfix for editing