Riven bug fix