issue #231