added fix for segfault.