issue #374