Testing fix for segfault...