Review comment fix