fixed the bug in 2.69