fixes T655
Auditors: kszumny, msmolik, pperduta