fixing some shit