Fix for RemoveUneeded spaces