Potential fixes for #530