Forgot some modification in other files for previous commit