Changed this because the string was not built in a consistent way IMHO.