fixing shiiiiit