And now fixed for edit too