Fix calculation
Fix column name order.