Fix for overnight (previously removed : from prefix/suffix was important for XMLType payload)