Fix to primitive construction