Add #1848

Signed-off-by: Yoshi2889 <rick.2889@gmail.com>
Merge pull request #1865 from Yoshi2889/1848

Add #1848