fix /push and /join