Remove extra space only; fix