Fixed Issue #195