BUGS 12098 and 12116 solved