fix for issue https://issues.infn.it/jira/browse/WMS-121