See issue #475