fixing an issue found with at scale testing