Fix for StackOverflow reported from play-store