Provisional fix when using extends for credentials.