Bug1007114

:whale2: