Fix for https://issues.infn.it/jira/browse/STOR-560
Merge pull request #20 from italiangrid/fix/STOR-560

Fix for https://issues.infn.it/jira/browse/STOR-560