Fix for #1818

Fix for #1818