Fixed fix for edit bug