Fixed for new constructors