Fix for #291

Fix for #291