Made the billboard handling work.