Fix SecureStub for the new layout