final fix pleeease