Fix from PR