Change Back to Server Implementation because it happens on fb too