fix  stuff