Class definition fix
Assignment fix in invocation