PR for #84 done on 3.x