FIX for variable columns (danger/comment are the last 2)