Fixed issue with feature numbering