bug correction in 2.6