Fixed colspan bug