Fix bug where columnspan is > total columns