Fix issue with elements span