fix the same review point from @SergNikitin