improvement to last fix