Fixed issue with default constructors