r2831 - also fix ticket:235 in trunk