Bug solved

An old bug was re-introduced in the last commit, and it's now solved. It caused grabbled output and seemingly random segmentation faults.