fix: to work with non surface elements