Fix internal storage