Lunch and type bug fix