Fixing memory issue since we aren't in ARC