FIXUP - handle undefined return value of modify callback