Two lines for Command Mode to fix #28