Fix NOOB issue #10