Fixing with instance params

Change-Id: Ib7bee346bbda3268523243f66e1329b94323c5ac