Issue #422 conventions