Fix for #1131

Fix for #1131