Fixed this finally for good.