Potential fix for #1545
fixes #2000