fixed bug iwth recent Optional<> change