Corrected errata in previous commit (not all columns were included).