Fix/storm 343