Recent checkins fix