fixed the extremly wired failures of our system