Model picker bug fix