Update described in Issue #59