Fix instruction order