Fixed Issue #197