Fixing ordering of issues