Possible fix for #2061