[ZD#42] Fix for 42