[ZD#5] Fix for this bad bug

Finally fixing this