Fix runtime issue