Crazy crash bug fix.