Fix "chicken and egg" problem in constructor