fix push and fetch