more fix related to WMS-124