Fixed break problems