WCP-171 : Fixed issue where editing was not possible due to... an issue.