Fix for #1150

Fix for #1150