fix for both kinds of nexus