final fix i hope