another editor bugfix merge