fixed issue with FB
more fixes