Fix Update Issue #201