fixed recognition of optionality