Potential solution for #53