Fixing good (8/24)

Fixing good