0.0.5 Fix segmentation fault