Fix for edit