Fixing goores shit