0620 ak fix rearranged calls