1.6.x does not work because of an atomic transactions