fix for issue WMS-108