Hack around invalid rid problem after pause