more breakage fixing