Fixing stage (4/18)

Fixing stage