Merge last fix