2.2.18: Fix ussue #8