Handle new bugs properly (still no tests.)