See issue #22