Fix issue #15.