Fix issue raised in PR review