fixed prevoius errors