[ZD#43] Fix for 43