added hack for csv support