better code for last fix