Please check #350 again.

Thanks.