fucking more fixes