Fix for issue #35, Custom name not working correctly