do we have any workaround to this issue?