final fix 42!