fix the fundam degeneration prob pointed by kevin