ZSS-440: (Duplicate ZSS-625) Fixed in zss 2.6