final fix for FB