Issue #435 fix convention