Fix #2514

Let me know if this works @margarett . It works for me.

Signed-off-by: Yoshi2889 <rick.2889@gmail.com>