Fix/stor 307