updated stubs for class redeclaration bug