Fix for Adaptable storage