fixed order of commands

prevents loops