Fixed fb issue