Wrong commit, added zombie chow hack fix (thanks to Antz)