fix for issue WMS-111