Attempt for Android fix.