Fixing storage rules