fix for issue WMS-105