Fix for issue #14 - XML rendering broken