Update after PR #20