Minor tweak to previous fix