Fixed Issue #158