Suggested fix for #2072