Fixed "eternal spinning wheel" problem.