fix an issue with no unwrapping optionals