[Re-](Re-)fix bugs... again.