Fixing goores mistakes.