calander_choice bug fix