Fix construct again