more fix for WMS-124