Fixed building on CM9