Fix optionality