Fixed problem with column order and null cell