bug fix and diksi support