Last commit fixed

problems with elements