Fix issue #235