CFY-800 bug fix - wrap the right invocation