Review comment fix v1