Issue #240
added extra parameters to delegate