QTE fix + save fix