Fixing stage (17/18)

Fixing stage