Fix a crush bug. This is the stable version now.