RT #115802, one fix, one todo added