added corrections in all cases