Fix issue #224