fix nil class error in comeback