upgraded 1.2.6 for bug fix