Corrected issue #10