Minor fix, major improvement