Workaround for Android local issue