Fix #2514

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

Fix #2514