Preliminary solution for issue #10.