FIxed execution ordering issue.