Fixing a stupid data structure mismatch bug. Doh!