fixing some SHIT