Fixed bug in a few elements