Make compatible with Yahoo change