adapting to comments in pull/232