fixed problems with earlier versions