Fixed problem with inconsistent row length handling