Fix/stor 496