Fixing stage (11/18)

Fixing stage