Bug fix for Android demo