final fix for a bit.