fix5 code changes

fix 5 changes