Fixing good (6/24)

Fixing good