Enable issue #10