Revert " * fix segfault"

This reverts commit d2e685213fbc4016000898ec393ced3c25c04c6f.