part of last fix