Fixed error with returning entry and exit nodes