Added a check if the field options are used, if not leave it ignored and don't add some. This was fixed due to ticket-0038.