Fixed issue with the edit form