Fixing good (16/24)

Fixing good