Fix bug: oops! More haste less speed :-(