FIX: build at the right position, again