Resolved Issue #199