Corrected column order and FK #264.