[ZD#27] Fix a bad bug