maybe fix internal storage