Fix/stor 341