issue #313