issue #366