Removed unnecessary 'constructing' flag