Fix construct, add isnull