Hopefully fixed crashing on adding command(s)