Fix for #121 on 2.5.x series.