Fixed bug with values defaulting to 'No'