FIXING WHITE-SPACE