Fix federation issue from mobile phones