Fix/stor 344