Issue #68: Critical bug fix