Fix for #1356
Fix for #1355