fixed fb and beacon