Why was this changed to a list? Seems to break things for me