corrections to make the corrections of the last commit work