Fix: Optional method should be called inside closure so that each generated value is optional