Fix edit controller