Fixed Issue #192