issue #225