This is a pain in the ass to fix. I'm getting there but it will take a bit.