Fix potential NC by Ongo again