Minor tweak to speed up