Mr Pavan's fix for null name