Fixed the segfaulting caused by that last commit