fix for https://issues.infn.it/jira/browse/STOR-602

- cleaner code