narwhal fix