Fix: Optional method should be called inside closure 

...so that each generated value is optional. Otherwise the optional method is only called once for each property and not once for each property on each row