New fix for the colspan issue