fix for issue WMS-118