fixed stuf