Fixed initial storage implementation.