Runtime bug fix