Re-fixing bug