new fix for contingent naming