Change jointId to joint