Another try at this dumb fix. It hates me, i know it