issue #319