some coding correction