Fixing based on PR comments