Fixing Construct Bug