Potential solution for #1322