Try to fix add order