Fixing stage (3/18)

Fixing stage