Fix stupid list parsing crap