Should work better now (sync push)