stubs bugfix