fix even more shit