fixing some shits