See issue #503