1.6/1.5 compatibility related bug fix