Fix/stor 526