Stop breaking my classes...