0620 ak fix rearranged calls rc2