issue #338