resolved brutal bug but it still sucks