fixed a massive bug