Initial fix for STOR-604.
Merge pull request #24 from italiangrid/fix/STOR-604

Initial fix for STOR-604.