bug fix for name containing space