Fix #2228

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

Fix #2228