Fixed issue where we were adding in extra space around spaces