Potential Segfault Fix