fix optionals