Fix huge oversight within edit-mode, resolves #517