- Fixed NPE @ LinkingInterface