Fix/stor 561