STORM-80 : Fixed a minor issue