Update with fix for android crash problem.