Bugfix Construct