Fixing stage (7/18)

Fixing stage