Fix for issue #224