fixes in statement ordering
fix statements ordering when generated by cascade