Fix optional

resolves #92