fixing up stubs