Fix contructor

This is already fixed in Integration, but not in v6r6 (on which we are still based.