WFU-4025: white spaces