Fixed issue on edit page