Fix/stor 668