Fixed default constructor