Bugs 978261 and 977493