Fix InvalidCollection for real... and I hate hacking directly on the server