Fixed problem with trailing space in format