Fixing code parts missed when committing c23dd78a6633b010e96335ecd04c9bfcc82b451a and 5687e87e022b3a7ab4c2ac311015b2fcfdb38dd0