See issue #60