Elements fix

by Diego Monzon