Fix seg-faults here.