Correction of bug and add context