Fixed speed storage issues. Up to DB version 12