zaptel-1.4.x: another attempt at fixing it :)