Fixing elements

Fixing elements