NEXUS-5998: fix last change to work properly with nexus-pro