Fixing white-space