BAC-1265 fixing white spaces