issue #549