Fix flawed system to prevent crisis