Massive bug fix.