tiket:1 fix bug from merge
tiket:1 add backward capability