Fixing constructor broken by last commit