Forgot to include Nalin's fix on the XML changes
6 files changed