bugfix: RT#95353 pt. 2