last fix 27-07