Fix for issue #26