Amended last fix