Fix for list parsing