Patch broken edit mode from #57