Fixing problem with change of type qualifier as the call statement is being type check

See Issue #389