r1465 + trying to resolve ticket:97 here