Fixed #453
Fixed #451; Fixed getName space issue
Fixed #451; Fixed getName space issue