See previous commit message, related to issue #18