Solve issue as requested by bus people.