Fixing stage 1 (21/24)

Fixing stage 1