Fix for FB&Google do support state