Fix/stor 501