Fixed Issue #169