fixing  3654360, 3654365,  3654368