fixed bug, added missing storage parameters