Fixed: PR comments