Fix for #1143

Fix for #1143