Fixed: build procedure