Fixed segfault, need to implement dual stack