fixed incorrect assumption
Merge branch '2.3.x'