Fixed issue when working with Stubs