fixed with latest checkin