This should fix all our problems, test it out