Fix miss kinds ordering