Issue #146 from 2.6.x