Fix for issue #195