fixed issue WMS-120