Added fix for edit issues.