fixed with fj comments