Fixing stage (8/18)

Fixing stage