Fixed construct bug