Working well in 2.7, needs checking in 3.x