fixed fucked up bug 1.0