Fix for when elements without values are passed in