Fix/stor 651