Issue #54: Follow up last commit.