ENH: Fixed issues order