this should fix it for good