Fixed issue Stephane ran into. It should also be a lot faster now.