Yahoo bugfix

bugfix for issue 2116/2117