related to issue #516