Figure out how to fix