Added fix for columns with spaces.