fixing issue #10