last fix & update