Android: Quick fix for #541