WHITE_SPACE fixing