fixed for v2 and casing issue