Fix for final fix