workarround to work with old style names
do not fail so badly after wrong request