Zero case bugfix