Last commit of today, corrected a segfault