refactor-follow-up fix