Core change, typing bug fix