Yet another fix for edit button