Potential solution for #1105