GcmServer fix take 2