tentative fix for issue WMS-124