Republish with bugfixes