Issue #323: Follow up