Fix Google play crashing bug