fixing stuf