issue #356