final fix..... maybe