@ohadlevy does that solve the problem for you?