New packaged version, might be helpful in figuring out what's going on.