[ZoG] Bugfix