GRECLIPSE-1396 Updated fix

Parameter.declaringClass unexpectedly became null that broke initial fix for the issue.