Hopefully work around formatting issues