fix for issue WMS-109