Hotfix for edit