Fixing Matt editing