Still working on a possible fix still.