Fix ordering of features