Bugfix storage server #2