Fix bug when the operation is selected first. Closes #6