Apply change suggested by @vaillancour