fixed; god knows whats happening in there