more fixing that blasted segfault.