BUG 13637 and 13640 SOLVED