Fix/stor 506