Try to fix the stuff