Fix $each