fixed enormous bug