Remove yield from for 3.2 compatibility