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

Fix/stor 561