Fix controller edit bug