Tentative fix for STOR-651
Merge pull request #28 from italiangrid/fix/STOR-651

Tentative fix for STOR-651