Stop switching the buffer commands, more often confusing than not.