FELIX-2776 Fixed a concurrent modification exception, and the order in which individual commands were executed.