Fix #1548 Hope we can publish it on play store :)