Fix from PR feedback