Fixing good (15/24)

Fixing good