fix for bug WMS-105