* fixed possible segfault