Implemented workaround for invalid op_array issue