Issue #421 conventions