BUGS 11135 and 12307 SOLVED