fix for issue WMS-115