Added ability to cancel waiting when selecting operator