Fix for issue #226