fixed problems with previos commit