fixed all stubs