See issue #490