Fixing command continuation; adding assumption.