fixes to method call closure
fix to the previous fix