BUG 11886 and 10395 SOLVED