Fixes 6313
Merge pull request #6323 from AndroidSFV/fix6313

Fixes 6313