Joint model bug fix