Fix for non-existing name