Fixed issue with edit item