Updated for issue #10