Fixed issue with useless calculated values appearing in output XML