Trying to root out the dreaded bugs that come from changing orientation