apply review comment from @yamkazu