#572 Fix colspan issue