Fixed yielding and dying