fix for issue WMS-119