bugfix for the issue reported by Brecht when using short-lived credentials