Fixing good (18/24)

Fixing good