Added Clem's sensational bug fix. Genius