Update for statements

fixed the problem of loading both statement types one after the other.