Fixed enormous bug