fxed errors