Fix #1393 for real

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

Fix #1393 for real