Issue #494 fix convention