ticket:14 fix ordering