[ZD#28] Fix a bad bug