Small bug fix with storage management.