hi @tengqm @windsonsea @dipesh-rawat, this is my first PR, could you please help approve it, thanks a lot!

Thanks, @cyy8 for this fix!
The preview looks good to me