Fix issue #10. Fix issue #11.