Fixed last-minute bug