Ref issue #3087

See issue #3087