almost there - NBX deadlocks in some cases??