Another fix for issue #195